From: Keir Fraser Date: Fri, 10 Dec 2010 16:40:05 +0000 (+0000) Subject: x86: acpi: Fix reboot attempt sequence. X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22Dat/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22Dat?a=commitdiff_plain;h=4000f53bc2751cca1a9bb868ab4b482cd28c8dc5;p=xen.git x86: acpi: Fix reboot attempt sequence. Signed-off-by: Keir Fraser --- diff --git a/xen/arch/x86/shutdown.c b/xen/arch/x86/shutdown.c index 7fbc33e485..c8821ed0a1 100644 --- a/xen/arch/x86/shutdown.c +++ b/xen/arch/x86/shutdown.c @@ -358,7 +358,7 @@ void machine_restart(unsigned int delay_millisecs) * After this we revert to our usual sequence: * KBD -> TRIPLE -> KBD -> TRIPLE -> KBD -> ... */ - reboot_type = (((attempt == 0) && (orig_reboot_type == BOOT_ACPI)) + reboot_type = (((attempt == 1) && (orig_reboot_type == BOOT_ACPI)) ? BOOT_ACPI : BOOT_TRIPLE); break; case BOOT_TRIPLE: